merge emacs-24
authorKenichi Handa <handa@gnu.org>
Thu, 13 Dec 2012 13:55:36 +0000 (22:55 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 13 Dec 2012 13:55:36 +0000 (22:55 +0900)

Trivial merge